From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 1 Apr 2009 12:12:13 +0000 (+0100)
Subject: ia64: Fix the build after max_cstate changes.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13989^2~20
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=fed6ed29b093cc6c717fefb1aad192f45bbb4149;p=xen.git

ia64: Fix the build after max_cstate changes.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c
index 8125e88951..33954307d7 100644
--- a/xen/drivers/acpi/pmstat.c
+++ b/xen/drivers/acpi/pmstat.c
@@ -530,13 +530,13 @@ int do_pm_op(struct xen_sysctl_pm_op *op)
 
     case XEN_SYSCTL_pm_op_get_max_cstate:
     {
-        op->get_max_cstate = max_cstate;
+        op->get_max_cstate = acpi_get_cstate_limit();
         break;
     }
 
     case XEN_SYSCTL_pm_op_set_max_cstate:
     {
-        max_cstate = op->set_max_cstate;
+        acpi_set_cstate_limit(op->set_max_cstate);
         break;
     }
 
diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index 9d140ef891..3e05dbf0bb 100644
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -35,6 +35,7 @@
 #define CONFIG_ACPI_SLEEP 1
 #define CONFIG_ACPI_NUMA 1
 #define CONFIG_ACPI_SRAT 1
+#define CONFIG_ACPI_CSTATE 1
 
 #define CONFIG_VGA 1
 
diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h
index cbf795aeaf..43bdade6c4 100644
--- a/xen/include/xen/acpi.h
+++ b/xen/include/xen/acpi.h
@@ -402,9 +402,7 @@ static inline int acpi_blacklisted(void)
 
 #endif /*!CONFIG_ACPI_INTERPRETER*/
 
-#define	ACPI_CSTATE_LIMIT_DEFINED	/* for driver builds */
-#ifdef	CONFIG_ACPI
-
+#ifdef	CONFIG_ACPI_CSTATE
 /*
  * Set highest legal C-state
  * 0: C0 okay, but not C1